bitkeeper revision 1.189 (3ead3b1cS7oGt_c65vuKxevku1phmQ)

use long instead of int for disk sizes
change default state file

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 0ab3c23f8b7697c56beeca8b6fa295723a1f958a..9ec62d9ca9b4ffb1c886fd43a00ba4ecefbeb38b 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,5 +1,6 @@
 ach61@boulderdash.cl.cam.ac.uk
 ach61@labyrinth.cl.cam.ac.uk
+ach61@soar.cl.cam.ac.uk
 akw27@boulderdash.cl.cam.ac.uk
 akw27@labyrinth.cl.cam.ac.uk
 akw27@plucky.localdomain

diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java
index 07093762947aaea6a0127243bfef2fd00118e1ae..70d8ed882db98b7cbc25d8502e37dff284fdf76d 100755 (executable)
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java
@@ -59,7 +59,7 @@ Library
    * convert a number (string format) into 
    * the corresponding integer value.
    */
-  static int
+  static long
   parse_size(String size)
   {
     String substring = size;
@@ -94,7 +94,7 @@ Library
       substring = size;
     }
 
-    return Integer.decode(substring).intValue() * suffix;
+    return Long.decode(substring).longValue() * suffix;
   }
 
   static String

diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java
index 2a036bbe9cb60e1a23ff287d683952c856809dd1..2110521bcb32adac0cd4c07496e5c5431b17d726 100755 (executable)
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java
@@ -10,8 +10,8 @@ import java.util.Date;
 public class
 Main
 {
-  static String state_filename_in  = "/var/run/vdmanager.xml";
-  static String state_filename_out = "/var/run/vdmanager.xml";
+  static String state_filename_in  = "/var/lib/xen/vdstate.xml";
+  static String state_filename_out = "/var/lib/xen/vdstate.xml";
   static String partition_filename = "/proc/partitions";
 
   void

diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java
index 72d5bb9441a3d40e3a89ceb92041f8de5ac3a8e2..0e529edfa268e18eb5a000746384a224610d6f43 100755 (executable)
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java
@@ -189,7 +189,7 @@ VirtualDisk
    */
 
   void
-  add_new_partition (Partition partition, int size)
+  add_new_partition (Partition partition, long size)
   {
     int loop;
 

diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java
index eeaa156414fd950fc53c5ec74047e30803411ce3..6d5877da2d349923487b40367212314681c31379 100755 (executable)
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java
@@ -35,7 +35,7 @@ VirtualDiskManager
   }
 
   public void
-  add_xeno_partition (Partition partition, int size)
+  add_xeno_partition (Partition partition, long size)
   {
     free.add_new_partition (partition, size);
     return;
@@ -46,7 +46,7 @@ VirtualDiskManager
    */
 
   public VirtualDisk
-  create_virtual_disk(String name, int size, Date expiry)
+  create_virtual_disk(String name, long size, Date expiry)
   {
     VirtualDisk vd = new VirtualDisk (name, expiry);
 

diff --git a/tools/vdmanager/vdmanager b/tools/vdmanager/vdmanager
index e58562496b7933707e41c28201992272d8189932..6ecaa197d92d13b064d7077f0cdd9a1f4c97d80b 100755 (executable)
--- a/tools/vdmanager/vdmanager
+++ b/tools/vdmanager/vdmanager
@@ -8,9 +8,9 @@ export PATH=${ANT_HOME}/bin:${JAVA_HOME}/bin:${PATH}
 # runtime
 export JAVA_HOME=../jre-1.4.1
 export PATH=${JAVA_HOME}/bin:${PATH}
-if [ -f /var/run/vdmanager.xml ]
+if [ -f /var/lib/xen/vdstate.xml ]
 then
-  cp /var/run/vdmanager.xml /var/run/vdmanager.old.xml
+  cp /var/lib/xen/vdstate.xml /var/lib/xen/vdstate.old.xml
 fi
 
 java -jar vdmanager.jar $*